From: Jan D <jan.h.d@swipnet.se>
Date: Fri, 16 Apr 2010 17:05:31 +0000 (+0200)
Subject: * xmenu.c (apply_systemfont_to_menu): *childs was incorrectly used.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8126^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c97b3f9250a8cb8e0a54b415cdf4b7f682f4e6b7;p=emacs.git

* xmenu.c (apply_systemfont_to_menu): *childs was incorrectly used.
---

diff --git a/src/xmenu.c b/src/xmenu.c
index c8067a47deb..796dd3093e8 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -978,14 +978,9 @@ apply_systemfont_to_menu (w)
   if (XtIsShell (w)) /* popup menu */
     {
       Widget *childs = NULL;
-      int num = 0;
 
-      XtVaGetValues (w, XtNnumChildren, &num, NULL);
-      if (num != 1) return; /* Should only be one. */
-
-      childs[0] = 0;
       XtVaGetValues (w, XtNchildren, &childs, NULL);
-      if (childs && *childs) w = *childs;
+      if (*childs) w = *childs;
     }
 
   /* Only use system font if the default is used for the menu.  */